merge trunk
authorK. Handa <handa@gnu.org>
Mon, 8 Jul 2013 05:42:36 +0000 (14:42 +0900)
committerK. Handa <handa@gnu.org>
Mon, 8 Jul 2013 05:42:36 +0000 (14:42 +0900)

Trivial merge